InputLoader updated, some tests fixed