Fixed a test problem and deleted unecessary code