cleanup and adding tests for the COPPA