Additional user tests, organizing test unit so its clean