Fix unit tests using Booleans