Fixed some more tests.
Prior to moving files to see why mocha is skipping some tests.
Moved invoke_mocha, it seemed to be interfering with tests.