begin getting back to 0 fails

inline properties to minimize test changes. If it's desired in the
future, can add it back
fix a pile of test fails

still some to go