Separated tests into new package, and split tests into two classes.