Modified base for my own unit tests