Fixed projection and some tests