More docs, test util separation