Using observable dependency, fixed up tests