Fixed a few things
Fixed a few things
test