JOHNZON-157 add more tests and remove obsolete code
2 files changed