Begin adding tests