Adding mock tools
Changes for now