Added unit/acceptance tests