Added basic unittesting