Updating tests to match building removal