fixed tests with updated menu syntax
spec fixes
code refactor

* cleaned up excessive class method/vars in all classes
* refactor class_var/inst_var helper method
* added source class
roll class refactor