Update tests for design changes