Acceptance tests

Fixes #315.
Because the renaming hassle is only an issue until #900 or #901 are done, I'm going to leave the second point (although i do think that it could be a better solution than current).