delete unit testing and bug fixes