Put tests in a separate file
Add more tests