Added vanities to close #309. Added tests for them as well.