cleanup + added test strings generation