New implementation of Subject rendering & fix test suite.