Began adding tests