Polish test code