completed tests on dev and toy example -all passed