Test suite & minor changes