Added test class and made most variables package accessible