Fix circular autoloading dependency in some spec runs