Modified Flexibility of Testing

Modified the JUnit Testing methods to make it more flexible