updated with more test code