Modifications to accomodate py.tests in application