fixed test errors, built out more functions