WIP: Finish basic test, wrapped in a scenario class