Fix issues
Cleanup
Test updates