Cleanup
Updated unit tests