Adding unit tests!