Typing+tests

[]

[]