Fixed broken unit tests
Added unit tests
Added unit tests