small adaptions regarding to implementation and testing