Removed old unit testing hook