Fixed #65: Move test classes back to the test folder.