Started to move the tests into corresponding files

Feel free to reject this.
If you like it I''ll finish this tomorrow.