Clean up tests and add #include <cstring> for strlen