Fixed up some tests and more added to suite