Fixed test.mod and added bool.mod to test boolean short-circuiting