* small changes to make the unittesting slightly more easy