Added user tests

Only other file changes should be removing unused imports/other checkstyle stuff