commented out some tests, will re-add later