More work on warnings
added tests