tests - major readability cleanup