Updated the tests based on inputs from Einar