Added unit tests;

Signed-off-by: Jonathan <jonathancw@me.com>
test changes;

Signed-off-by: Jonathan <jonathancw@me.com>