Static vs instance

Those thow commits first create the failing test than fix it.