Updated tests to latest code from core lavaca