More boring fixes: move test fiels around, polish some more on the api. Add more tests.