Fixes the prefix / system_name

system name gets included whenever you don't specify it
Fixed up a bunch of the tests and comments too