fixed tests and bad calling of moment