TEST: move tests lo the new location. Fix formatting too.