test
More testing, fix bug.