@andreistefanescu is this file currently being tested or does he need to add tests he wants to be used to another file somewhere?