-moved several setters to default as they are only for testing and
didn't need to be public