Super basic tests and tweaks; still don't use