Refactor tests and add specific options