Removed debug data, added skeleton for test suite