Add test, fix other tests