Updating description, some test cleanup