additional tests and corrections to router