Feature simple unit tests 7.0