Get tests passing on all platforms