Added tests for the trivial stuff