Add test, fix test
Fix build error