Start generating correct VHDL again

Some test cases are now verified to produce correct VHDL