Refactroing and removing test sources to temp to remove later