Fixed easier testing possibilities