Move tests to their own directory
Fix weird tests