Updating structs to use labels, adding tests for env stuff