s/contains/match/
minor bugfixing, ocd cleanup and our first test