refactored tests, divided in different files