Added a timing test, minor modifications in 02