project structure fixed. some test fixes