Fixed tests
Never goes cherry-picking something you don't trust.
Built