Update tests for Base changes