Optimized existing tests, added tests JC-6...JC-12