Added tests, sorted out irregulars