Added old tests - need to be fixed