Added more tests
should find a way to aviod repeating myself in all tests...