Added more tests, everything runs correctly