Factory girl changes and calculator refactor.