Refactorying, permit now temporarily undef, expect behaving as expected
Some minor changes to the not so clever test script