more test writin n todos
findin bugs by testin
improving test code