fixed bugs with or, made apps in tests be reused to improve testing
to catch more closure related bugs