Add forward declaration header and update tests