Moved test coverage up to 85.31%

Added more "flow" tests.