Dropped old check arguments functionality

Added new check arguments mock

Code refactoring