Fixed tests and options