Cleanup and at bit more tests