Split test assembly to 8.0 and 8.1 versions