enhance the tests a little bit, make sure None/returned value is set correctly