Added few tests
Made loader Django 1.6 compatible