Further fix height issues, improve upon tests