Added constructor options and emit tests