Add more tests and missing yml