sceptically added some units tests