small updates, some unittesting added