Add added Tests which escaped my notice the first time aroudn