Reorganize push test