Resolved some warnings

Includes some cleanup, improved some tests to have more meaning.