Use Idea annotations version 13; begin using @Contract; some utility code and tests improvements