finishing the entry point, expanding test coverage