I see a lot of similarities between the 2 test classes, is there anyway we can avoid that?