Fixed tests, build settings