More comprehensive test, still working