Unit tests and acceptance tests added