Final Test Lib Code

Added the last missing feature to the test Code.