Update tests to solve substring failures