Make template from file optional
Adding more module tests