Reformatted tests a little. Conversion methods now take params. Added further conversions methods