Merge pull request #412 from tkolhar/master

Added test for ID 274294
rework on Tazim's PRs: refactoring method calls, making the type as parameter to the calls.