Changed table layout, added insert user, more tests, etc