Added Conan and Eric's Tests