removed intermidiary outputs
renamed and completed more tests