Fixed failing tests

Added missing headers