rewrote tests to use parser