Try to remove all the platform dependent stuff

And updated the tests to work as planned
Work-around.
Merge pull request #226 from mhaskel/moar_test_fixes

Try to remove all the platform dependent stuff