Fix for failing tests and hard tabs