simplified options

removed the need to parse options - they will be added as a hash anyway

also updated tests