BS-11577 - add more tests + fix FormNotFoundException not thrown