More tests

Only one scenario fails now.