Added more tests around recording functionality