Add first real tests
Some more tests
Improve style