Improved test, adding support and use of unittest