Made several classes public for unit testing