Implementing more options and tests.