small improvements
first productive tests