Modified Tests & Friends

Created Equipment test…