fixxed unit tests