Move test file into test directories
Write API logging