Fixed the rudimentary tests.