Updated push/pop and related tests