Added test tools
Work in progress