Added tests for conventions

Implemented tests for conventions. Ready to merge :)