updated tests, made them more specific and focused.
cleaned up format of mvc's, separated definitions from instances