slight changes
added some more tests