Finish tests spec'ed by Sascha