Finally ready for tests