Further refactoring, another suite now based on variables and prefixed with UnitTests