Closes #3 - Backport acceptance tests