Added moar tests. Not in working state. Safety commit.