turn on fs warning 1182.  remove a couple of unused lets.
replace an if-then-else with a match
replace another if-then-else with a match
add a test to verify proper ordering
organized tests project a little better