Edited unit tests and acceptance tests