Added some tests
Working ok now 1.1..0