Modified a couple tests to return true/false.