Small fixes, arranged tests and example