Implement Factory Girl and Update Tests