Many new additions (a test class for Hydro)