#386 Changed testing source to localdump
#386 Gave entity controller var a verbose name
#386 Removed obsolete code
#386 Removed obsolete code
#386 Added missing method