Update tests for most recent changes