More boolean tests and fixed issue for single param