Moved signature generation methods to static methods in new class, fixed tests