reverted imports to proper imports because it prevented testing, updated tests to test boundaries, fixed boundary stuff