Address more tests