Cleaned up user model test and started adding support for operand model