Fix observatory and deployment tests