Unit Test

Updated units tests and added 2 more.