Using proper finders, adding test for create and update