upgrade to moment 2.6, test changes, bugfix