Add in further tests