Added tests; fixed existing tests; addressed CR feedback