Removed full rails and put in combustion

Have tests working with combustion
Starting refactoring of tests