Added Norris' test stubs