Fixed tests due to design changes