Added testing suite. All tests but one pass