Added tests and record support files