Started adapting unittest