Test: add back frequencies
bus tweaks clean up