Fixed unit test

Basic functionality working