Started to redesign test suite according to standard conventions