added functional test and reinstated old coe
changes made given functional tests run in order