This looks like it should've been done with the testbed model refactor? It's a bit confusing to read the changes separately here. It may be best to move linux session to API first and then the rest of the testbed model separately to avoid it being confusing.