changed tests a bit