Start cleaning up the kaiten class and testing suite