Added more testing and shit