Seperate test tool into test package