Removed unused test stuff