Feature/48 improve acceptance tests

Fix #48 
Fix #54