Add max height capping, clean up unneeded code.o
Update tests, write resultsd into CSV