Edited user and usertest to use auto increment