fixed tests that failed after changing the declarations