Remove model and property test