Replaced empty lines with comments or nothing and added test vacuoles and emitter