Reverting to simple test