Clean up some more
Add coverage testing
Fix server tests for the moment