Update manifest
Move tests to correct directory