#271 Pushing the latest changes to attempt to fix the test inconsistency problem.