Unit tests working again (Yay)