Adding testcases and moving classes around