added more tests and changed test style to FlatSpec