Began to write some tests