fixed test suite
Cleaned up warnings