Additional unit tests and modularisation of unit testing