Logic error fix
A basic test
Logic corrections and proper string tests
Tests reorganized