Added more parameter tests and made small tweaks to implementation