updated with tests moved to project root