added tests for console scripts and fixed some related problems
Changed interceptor to use annotations