Some tests now pass

Signed-off-by: Raymond Rusk <Rusk.Raymond@gmail.com>