Move all tests into single file
Add forgotten files
Add test for #6