moved test block back where it belongs