Merged test from python code.
Restructure.
WIP