Fixed tests, fixed linux