Not sure if extracting all those classes is useful - they are all very specific to these two tests. Moving the actual tests to the top is a good idea though.