test commit, removed private methods so they could be tested, also improvments on junit test class