Fixed some tests, commented some out (platformdependent)