move tests into proper namespace