Adding unit/acceptance tests for Kevin and Gresh