Strange changing of test
Fixed structure, optimized import and unused fields of tests.