Just changed the tests a bit
Pulled and merged from origin/master