Added new "advanced" tests and the tests all pass now!