Added some test points and cleaned up v1.6