Improve unit tests

[alexkhil]

• Reduce number of useless unit tests
• Move json test data to separate json file instead return from method