Implement more tests