Seperate Asserts

Attempt to seperate asserts from source to be tested