Updated references to Kelp
Fixed the unit tests.