additional tweaks, add stub test method