Began working on tests