@kaiprt @mendoncakr Spec testing and models cleaned up