More tests and missing file in prev commit