some refactoring of the test class

I think that you could try to move the deadline to Tuesday as I have
some questions about the test itself, ok?