Additional fixes to move tests to separate module.