Updated

Updated tests and renamed things