Correct handling of white space in test
Added the possibility to use null for initial state
Reformatted output to ease debugging
WIP