passing options and fixing tests