Initial stupid rewrite of the test