Towards working tests...