++unit tests / some goodies! :+1: