testing and fixing re-factoring