Changed testing framework
Directory and file name changes
Added a range check on initialization
Tests!