Added configuration test and some other stuff