divided some assertions in various cohesive methods and renamed method names to conform to agile documentation (affects #2316)