PE-834, PE-424: remove unused test code pieces
PE-834, PE-424: remove extra whitespace