Test code now considerably more maintainable