Added working unittests