Updating/adding tests