These should have been public.
Write remaining tests
Fix formatting and suppress unnecessary warning