Refactor app tests; Support boolean fields