Added tests which are a bit iffy but finishing here