Added basic Unit Tests