Don't use @subject for unit tests, isn't working quite right... :haircut: