Made most helper methods chainable and updated tests.