Making the testing working again. Does not work properly with Travis yet.