Fixed tests for the user and extended them to coverage.