Started adding unittesting