fixing tests to follow module structure