Finished current acceptance tests
Merged Acceptance Tests of Roel and me. Also put them in the right order.