Moved mikael sketch
Rearranged tests