Adding some on-the-fly options and more tests