Finished update ower tests, bug fixes