Split test-case in two and fixed bug