fixed all junits! needs cleanup though