Fixed acceptance tests
Approved changes to classic version