WIP - Conversion of tests