add audio/video handlers; add tests