Completed up to "Test for base expectations". Methods reorganized in rb file for easier use.