czaheri updated acceptance tests and added unit tests