Inline one line tests, remove unused methods