New test suite… Minor changes