Applying dbevenius's feedback on test improvements