TESTS restructure as several test classes