Delay association checking to later point & cleanup some tests