Added more tests
Fixed wrong assertEquals parameters order