(ngi73) Updated my unit tests and acceptance tests