slight restructure fix... for tests.