Fixed non-compiling tests