Create more test data, fix errors and logic