Try to remove all the platform dependent stuff

And updated the tests to work as planned