Add missing unit tests from #156 which now break tests