FUL-285 - add new tests (in progress)