Made classes public, added a test