Further changes to tests - now they all should pass! Tests have also been made portable across platforms.