Adds more tests and works forgery gem into factories