Added test units

More tests are needed