Implement more testing