Tries to add proper acceptance and unit test