Handle more falsy cases, add more tests