Few changes to the tests for Before