Added some unit tests / expanded parametrics