Accuracy overhaul initial tests (math looks slightly wrong)