Removed old tests, added validation, some reformat
Added Entry and User Unit Validation Tests