tests working or marked TODO
testml refactoring