Maintenance

Cleaning up testing